projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
82d38e3
)
frame: Use measure() to measure label size
author
Timm Bäder
<mail@baedert.org>
Thu, 27 Oct 2016 07:54:42 +0000
(09:54 +0200)
committer
Timm Bäder
<mail@baedert.org>
Fri, 28 Oct 2016 14:33:02 +0000
(16:33 +0200)
gtk/gtkframe.c
patch
|
blob
|
history
diff --git
a/gtk/gtkframe.c
b/gtk/gtkframe.c
index 270ab1e928207007d655e61348d59a58bce451d6..47ab381e96388285fe62b299e26fb56bc6843cf2 100644
(file)
--- a/
gtk/gtkframe.c
+++ b/
gtk/gtkframe.c
@@
-920,11
+920,7
@@
gtk_frame_measure (GtkCssGadget *gadget,
}
else
{
- if (for_size > 0)
- gtk_widget_get_preferred_height_for_width (priv->label_widget,
- for_size, &child_min, &child_nat);
- else
- gtk_widget_get_preferred_height (priv->label_widget, &child_min, &child_nat);
+ gtk_widget_measure (priv->label_widget, orientation, for_size, &child_min, &child_nat, NULL, NULL);
*minimum += child_min;
*natural += child_nat;